From: Andreas Schwab Date: Sat, 30 Apr 2011 17:57:07 +0000 (+0200) Subject: * lisp/faces.el (face-spec-set-match-display): Don't match toolkit X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~3982 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=bbc9168121fc9b0b0ac3b9f1f13e1af67a77b65b;p=emacs.git * lisp/faces.el (face-spec-set-match-display): Don't match toolkit options on terminal frames. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e2c925a6806..7ffc059903a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-04-30 Andreas Schwab + + * faces.el (face-spec-set-match-display): Don't match toolkit + options on terminal frames. + 2011-04-29 Stefan Monnier * progmodes/pascal.el: Use lexical binding. diff --git a/lisp/faces.el b/lisp/faces.el index e7cfa200602..3fb8bc80931 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1451,18 +1451,18 @@ If FRAME is nil, the current FRAME is used." ;; of supported colors, and all defface's ;; are changed to look at number of colors ;; instead of (type graphic) etc. - (and (null (window-system frame)) - (memq 'tty options)) - (and (memq 'motif options) - (featurep 'motif)) - (and (memq 'gtk options) - (featurep 'gtk)) - (and (memq 'lucid options) - (featurep 'x-toolkit) - (not (featurep 'motif)) - (not (featurep 'gtk))) - (and (memq 'x-toolkit options) - (featurep 'x-toolkit)))) + (if (null (window-system frame)) + (memq 'tty options) + (or (and (memq 'motif options) + (featurep 'motif)) + (and (memq 'gtk options) + (featurep 'gtk)) + (and (memq 'lucid options) + (featurep 'x-toolkit) + (not (featurep 'motif)) + (not (featurep 'gtk))) + (and (memq 'x-toolkit options) + (featurep 'x-toolkit)))))) ((eq req 'min-colors) (>= (display-color-cells frame) (car options))) ((eq req 'class)